Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Display an error message if room not found #325

Merged
merged 3 commits into from
Jun 28, 2016
Merged

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jun 24, 2016

Fixes element-hq/element-web#1012

Also remove the canJoin prop from RoomPreviewBar which was only ever set to true.

else if (this.props.canJoin) {
var name = this.props.room ? this.props.room.name : "";
else if (this.props.error) {
var name = this.props.roomAlias || "This room";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

roomAlias needs adding to propTypes

@richvdh richvdh assigned dbkr and unassigned richvdh Jun 28, 2016
@richvdh richvdh mentioned this pull request Jun 28, 2016
@dbkr dbkr assigned richvdh and unassigned dbkr Jun 28, 2016
@@ -117,6 +117,10 @@ module.exports = React.createClass({
guestsCanJoin: false,
canPeek: false,

// If we failed to load information about the room,
// store the error here.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string? something else?

@richvdh richvdh assigned dbkr and unassigned richvdh Jun 28, 2016
@richvdh
Copy link
Member

richvdh commented Jun 28, 2016

lgtm otherwise

@dbkr dbkr merged commit a4329aa into develop Jun 28, 2016
@richvdh richvdh deleted the dbkr/room_not_exist_error branch February 15, 2017 13:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants